remove conflict mark
authorMatt Wilson <msw@src.gnome.org>
Thu, 25 Oct 2001 15:17:57 +0000 (15:17 +0000)
committerMatt Wilson <msw@src.gnome.org>
Thu, 25 Oct 2001 15:17:57 +0000 (15:17 +0000)
commit2a3d5739ed0c5117bdda67c47a21eab41b72d52d
treea3d0be7762e78f4f2134927ce711d41808717c6d
parentd8bd40f744dcded3e43c05f5cce09150e6d7ef9d
remove conflict mark
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8